full comparison of candidates #3702
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #3702 +/- ##
==========================================
- Coverage 74.47% 73.96% -0.51%
==========================================
Files 269 291 +22
Lines 23925 24722 +797
==========================================
+ Hits 17818 18286 +468
- Misses 5174 5502 +328
- Partials 933 934 +1
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
|
not sure if it's necessary to make this change, should also follow the suggestions in #3700 |
Liuhaai
reviewed
Dec 2, 2022
action/protocol/staking/candidate.go
Outdated
| @@ -253,7 +253,37 @@ func (l CandidateList) Less(i, j int) bool { | |||
| if res := l[i].Votes.Cmp(l[j].Votes); res != 0 { | |||
| return res == 1 | |||
| } | |||
| return strings.Compare(l[i].Owner.String(), l[j].Owner.String()) == 1 | |||
| switch strings.Compare(l[i].Owner.String(), l[j].Owner.String()) { | |||
There was a problem hiding this comment.
func (l CandidateList) Less(i, j int) bool {
if res := l[i].Votes.Cmp(l[j].Votes); res != 0 {
return res == 1
}
if res := strings.Compare(l[i].Owner.String(), l[j].Owner.String()); res != 0 {
return res == 1
}
if res := strings.Compare(l[i].Operator.String(), l[j].Operator.String()); res != 0 {
return res == 1
}
return strings.Compare(l[i].Name, l[j].Name) == 1
}
There was a problem hiding this comment.
- @Liuhaai agree comparing these 2 fields should suffice, and I think since we fix this compare func now, we'd better compare all fields to cover all possible corner cases
- prefer to use
if res != 0 {
return res == 1
}
to be consistent, instead of switch case
raullenchai
approved these changes
Dec 5, 2022
|
SonarCloud Quality Gate failed.
|
dustinxie
reviewed
Dec 5, 2022
| case -1: | ||
| return false | ||
| if res := strings.Compare(l[i].Operator.String(), l[j].Operator.String()); res != 0 { | ||
| return res == 1 | ||
| } | ||
| switch { | ||
| case l[i].SelfStakeBucketIdx > l[j].SelfStakeBucketIdx: | ||
| return true | ||
| case l[i].SelfStakeBucketIdx < l[j].SelfStakeBucketIdx: | ||
| return false | ||
| } |
There was a problem hiding this comment.
if l[i].SelfStakeBucketIdx != l[j].SelfStakeBucketIdx {
return l[i].SelfStakeBucketIdx > l[j].SelfStakeBucketIdx
}
Liuhaai
approved these changes
Dec 6, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix #3700
Current implementation only compares votes and owner addresses. This pr adds more comparisons, which includes all fields in candidate.
Fixes #(issue)
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Test Configuration:
Checklist: